Update Visual Studio Property Sheets

-For the binary "installation", look for the DLL files with their file
 names consistent with the ones that are generated with the respective
 Visual Studio projects.
-Remove any stray GDK DLLs that were left over from a Broadway-enabled
 GDK when building a non-Broadway-enabled GTK+ binary set.

diff --git a/build/win32/vs10/gtk-install-bin.props b/build/win32/vs10/gtk-install-bin.props
index b1602d3065055dfa49b25904a25c2362e5bd74ef..46dd52881da9025dc1b8b5e0ea640772c64bd351 100644 (file)
--- a/build/win32/vs10/gtk-install-bin.props
+++ b/build/win32/vs10/gtk-install-bin.props
@@ -26,16 +26,16 @@ goto DONE_BIN
 \r
 :DO_BROADWAY_BIN\r
 \r
-copy $(Configuration)\$(Platform)\bin\gdk-3-vs*.dll $(CopyDir)\bin\r
+copy $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin\r
 \r
 copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib\r
 \r
 copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin\r
 \r
 \r
-if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin\r
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin\r
 \r
-if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin\r
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin\r
 \r
 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib\r
 \r
@@ -44,9 +44,9 @@ if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailu
 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.exe $(CopyDir)\bin\r
 \r
 \r
-if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin\r
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin\r
 \r
-if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin\r
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin\r
 \r
 if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib\r
 \r

diff --git a/build/win32/vs10/gtkprebuild.props b/build/win32/vs10/gtkprebuild.props
index af4c1b6bbf9ae400f74fdaed2b7dd2b733bd5cc8..5a3cbbf37296d3358f584d47652b93e3ef0325ae 100644 (file)
--- a/build/win32/vs10/gtkprebuild.props
+++ b/build/win32/vs10/gtkprebuild.props
@@ -23,6 +23,10 @@ if exist ..\..\..\MSVC_Release_Broadway del ..\..\..\MSVC_Release_Broadway
 \r
 if exist ..\..\..\MSVC_Debug_Broadway del ..\..\..\MSVC_Debug_Broadway\r
 \r
+if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
\r
+\r
+if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
\r
+\r
 if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug\r
 \r
 if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release\r

diff --git a/build/win32/vs9/gtk-install-bin.vsprops b/build/win32/vs9/gtk-install-bin.vsprops
index 47e79e8407cf257f6d2c99cec3797f23b234f004..e47dc92b245fe409723ca3135ebb7ab22a214a17 100644 (file)
--- a/build/win32/vs9/gtk-install-bin.vsprops
+++ b/build/win32/vs9/gtk-install-bin.vsprops
@@ -20,18 +20,18 @@ copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

 goto DONE_BIN
\r
 \r
 :DO_BROADWAY_BIN
\r
-copy $(ConfigurationName)\$(PlatformName)\bin\gdk-3-vs*.dll $(CopyDir)\bin
\r
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
\r
 copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib
\r
 copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin
\r
 \r
-if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gtk-3-*.dll $(CopyDir)\bin
\r
-if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gailutil-3-*.dll $(CopyDir)\bin
\r
-if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gtk*-$(ApiVersion).lib $(CopyDir)\lib
\r
-if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gailutil*-$(ApiVersion).lib $(CopyDir)\lib
\r
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
\r
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin
\r
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
\r
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
\r
 if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*.exe $(CopyDir)\bin
\r
 \r
-if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gtk-3-.dll $(CopyDir)\bin
\r
-if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gailutil-3-.dll $(CopyDir)\bin
\r
+if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
\r
+if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin
\r
 if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
\r
 if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
\r
 if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*.exe $(CopyDir)\bin
\r

diff --git a/build/win32/vs9/gtkprebuild.vsprops b/build/win32/vs9/gtkprebuild.vsprops
index 1b23eff6c0f6b0d4fe3460b168de3e247f9bd0da..bd8fce0674bb20c66f7f06e527d6b3439c5f0cd1 100644 (file)
--- a/build/win32/vs9/gtkprebuild.vsprops
+++ b/build/win32/vs9/gtkprebuild.vsprops
@@ -16,6 +16,8 @@ if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h

 if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
\r
 if exist ..\..\..\MSVC_Release_Broadway del ..\..\..\MSVC_Release_Broadway
\r
 if exist ..\..\..\MSVC_Debug_Broadway del ..\..\..\MSVC_Debug_Broadway
\r
+if exist $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
\r
+if exist $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib del $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib
\r
 if "$(ConfigurationName)" == "Release" del ..\..\..\MSVC_Debug
\r
 if "$(ConfigurationName)" == "Debug" del ..\..\..\MSVC_Release
\r
 copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
\r